[beta] backports #148591

cuviper · 2025-11-06T17:59:53Z

Enable file locking support in illumos Enable file locking support in illumos #148322
Fix wasm_import_module attribute cross-crate Fix wasm_import_module attribute cross-crate #148363

r? cuviper

(cherry picked from commit 3d9c69b)

This commit fixes an accidental regression from 144678 where wasm targets would now accidentally use the wrong import module map for a symbol causing a symbol to skip mangling. This can result in compilation failures when symbols are used in cross-crate situations. Closes 148347 (cherry picked from commit 93fef45)

cuviper · 2025-11-06T19:09:35Z

@bors r+ rollup=never

bors · 2025-11-06T19:09:39Z

📌 Commit f9466e2 has been approved by cuviper

It is now in the queue for this repository.

bors · 2025-11-07T17:39:15Z

⌛ Testing commit f9466e2 with merge e913417...

[beta] backports - Enable file locking support in illumos #148322 - Fix `wasm_import_module` attribute cross-crate #148363 r? cuviper

bors · 2025-11-07T17:52:22Z

💔 Test failed - checks-actions

cuviper · 2025-11-07T18:25:38Z

Hmm, NPM error in tidy, but it doesn't complain locally for me...

@bors try jobs=tidy

[beta] backports try-job: tidy

rust-log-analyzer · 2025-11-07T18:36:21Z

The job tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

spellchecking files
building external tool typos from package [email protected]
finished building tool typos
npm WARN deprecated [email protected]: < 24.10.2 is no longer supported
npm ERR! code 127
npm ERR! git dep preparation failed
npm ERR! command /node/bin/node /node/lib/node_modules/npm/bin/npm-cli.js install --force --cache=/home/user/.npm --prefer-offline=false --prefer-online=false --offline=false --no-progress --no-save --no-audit --include=dev --include=peer --include=optional --no-package-lock-only --no-dry-run
npm ERR! npm WARN using --force Recommended protections disabled.
npm ERR! npm WARN deprecated [email protected]: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
npm ERR! npm WARN deprecated [email protected]: Glob versions prior to v9 are no longer supported
npm ERR! npm WARN deprecated [email protected]: Glob versions prior to v9 are no longer supported
npm ERR! npm WARN deprecated [email protected]: This functionality has been moved to @npmcli/fs
npm ERR! npm WARN deprecated [email protected]: This package is no longer supported. Please use @npmcli/package-json instead.
npm ERR! npm WARN deprecated [email protected]: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
npm ERR! npm WARN deprecated [email protected]: This package is no longer supported.
npm ERR! npm ERR! code 127
npm ERR! npm ERR! path /home/user/.npm/_cacache/tmp/git-cloneXXXXXXMH1l0G/node_modules/rollup
npm ERR! npm ERR! command failed
npm ERR! npm ERR! command sh -c patch-package
npm ERR! npm ERR! sh: 1: patch-package: not found
npm ERR! 
npm ERR! npm ERR! A complete log of this run can be found in: /home/user/.npm/_logs/2025-11-07T17_51_14_080Z-debug-0.log

npm ERR! A complete log of this run can be found in: /home/user/.npm/_logs/2025-11-07T17_51_06_862Z-debug-0.log
npm install did not exit successfully
tidy [extra_checks]: IO error: npm install returned exit code exit status: 127
tidy [extra_checks]: FAIL
tidy: The following check failed: extra_checks
Bootstrap failed while executing `test src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck`
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/rust-tidy /checkout /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo /checkout/obj/build 4 /node/bin/npm --extra-checks=py,cpp,js,spellcheck` failed with exit code 1
Created at: src/bootstrap/src/core/build_steps/tool.rs:1549:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:1280:29

Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:02:52
  local time: Fri Nov  7 17:51:36 UTC 2025
  network time: Fri, 07 Nov 2025 17:51:36 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

rust-bors · 2025-11-07T18:39:33Z

💔 Test for 531eec0 failed: CI. Failed jobs:

try - tidy (web logs, extended logs)

cuviper · 2025-11-07T18:42:27Z

https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/CI.20keeps.20failing.20because.20of.20npm.20error/with/554393053

rust-log-analyzer · 2025-11-07T20:25:31Z

The job tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)

spellchecking files
building external tool typos from package [email protected]
finished building tool typos
npm WARN deprecated [email protected]: < 24.10.2 is no longer supported
npm ERR! code 127
npm ERR! git dep preparation failed
npm ERR! command /node/bin/node /node/lib/node_modules/npm/bin/npm-cli.js install --force --cache=/home/user/.npm --prefer-offline=false --prefer-online=false --offline=false --no-progress --no-save --no-audit --include=dev --include=peer --include=optional --no-package-lock-only --no-dry-run
npm ERR! npm WARN using --force Recommended protections disabled.
npm ERR! npm WARN deprecated [email protected]: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
npm ERR! npm WARN deprecated [email protected]: Glob versions prior to v9 are no longer supported
npm ERR! npm WARN deprecated [email protected]: Glob versions prior to v9 are no longer supported
npm ERR! npm WARN deprecated [email protected]: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
npm ERR! npm WARN deprecated [email protected]: This functionality has been moved to @npmcli/fs
npm ERR! npm WARN deprecated [email protected]: This package is no longer supported. Please use @npmcli/package-json instead.
npm ERR! npm WARN deprecated [email protected]: This package is no longer supported.
npm ERR! npm ERR! code 127
npm ERR! npm ERR! path /home/user/.npm/_cacache/tmp/git-cloneXXXXXXjLzaJT/node_modules/rollup
npm ERR! npm ERR! command failed
npm ERR! npm ERR! command sh -c patch-package
npm ERR! npm ERR! sh: 1: patch-package: not found
npm ERR! 
npm ERR! npm ERR! A complete log of this run can be found in: /home/user/.npm/_logs/2025-11-07T18_38_50_106Z-debug-0.log

npm ERR! A complete log of this run can be found in: /home/user/.npm/_logs/2025-11-07T18_38_42_723Z-debug-0.log
npm install did not exit successfully
tidy [extra_checks]: IO error: npm install returned exit code exit status: 127
tidy [extra_checks]: FAIL
tidy: The following check failed: extra_checks
Bootstrap failed while executing `test src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck`
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/rust-tidy /checkout /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo /checkout/obj/build 4 /node/bin/npm --extra-checks=py,cpp,js,spellcheck` failed with exit code 1
Created at: src/bootstrap/src/core/build_steps/tool.rs:1549:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:1280:29

Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:02:46
  local time: Fri Nov  7 18:39:10 UTC 2025
  network time: Fri, 07 Nov 2025 18:39:10 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

cuviper · 2025-11-07T23:36:35Z

@bors retry

Zalathar · 2025-11-09T02:27:51Z

Scheduling: If rollups fail, prefer rollup=never over non-rolled-up iffy.

@bors p=1

Zalathar · 2025-11-09T03:28:32Z

Actually, let's give this a fair chance to run before the next rollup.

@bors p=5

bors · 2025-11-09T05:18:43Z

⌛ Testing commit f9466e2 with merge f3f1244...

bors · 2025-11-09T08:26:26Z

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing f3f1244 to beta...

pietroalbini and others added 2 commits November 6, 2025 09:51

enable flock for illumos

4061cf6

(cherry picked from commit 3d9c69b)

rustbot assigned cuviper Nov 6, 2025

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 6, 2025

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 6, 2025

bors added a commit that referenced this pull request Nov 7, 2025

Auto merge of #148591 - cuviper:beta-next, r=cuviper

e913417

[beta] backports - Enable file locking support in illumos #148322 - Fix `wasm_import_module` attribute cross-crate #148363 r? cuviper

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 7, 2025

This comment has been minimized.

Sign in to view

rust-bors bot added a commit that referenced this pull request Nov 7, 2025

Auto merge of #148591 - cuviper:beta-next, r=<try>

531eec0

[beta] backports try-job: tidy

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 7, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 9, 2025

bors merged commit f3f1244 into rust-lang:beta Nov 9, 2025
12 of 13 checks passed

rustbot added this to the 1.92.0 milestone Nov 9, 2025

[beta] backports #148591

[beta] backports #148591

Conversation

cuviper commented Nov 6, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cuviper commented Nov 6, 2025

Uh oh!

bors commented Nov 6, 2025

Uh oh!

bors commented Nov 7, 2025

Uh oh!

bors commented Nov 7, 2025

Uh oh!

cuviper commented Nov 7, 2025

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Nov 7, 2025

Uh oh!

rust-bors bot commented Nov 7, 2025

Uh oh!

cuviper commented Nov 7, 2025

Uh oh!

rust-log-analyzer commented Nov 7, 2025

Uh oh!

cuviper commented Nov 7, 2025

Uh oh!

Zalathar commented Nov 9, 2025

Uh oh!

Zalathar commented Nov 9, 2025

Uh oh!

bors commented Nov 9, 2025

Uh oh!

bors commented Nov 9, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

cuviper commented Nov 6, 2025 •

edited by rustbot

Loading